Merge "mediawiki.action.edit.preview: New module replacing preview.js"

author Trevor Parscal <tparscal@wikimedia.org>

Tue, 25 Sep 2012 18:49:23 +0000 (18:49 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 25 Sep 2012 18:49:23 +0000 (18:49 +0000)
author Trevor Parscal <tparscal@wikimedia.org>
Tue, 25 Sep 2012 18:49:23 +0000 (18:49 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 25 Sep 2012 18:49:23 +0000 (18:49 +0000)
diff --cc RELEASE-NOTES-1.20
Simple merge
diff --cc includes/EditPage.php
Simple merge
diff --cc resources/Resources.php
Simple merge
author	Trevor Parscal <tparscal@wikimedia.org>
	Tue, 25 Sep 2012 18:49:23 +0000 (18:49 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 25 Sep 2012 18:49:23 +0000 (18:49 +0000)
		1	2
RELEASE-NOTES-1.20	patch \|	diff1 \|	diff2 \|	blob \| history
includes/EditPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/Resources.php	patch \|	diff1 \|	diff2 \|	blob \| history